Some welcome and not so welcome improvements