Lots of little improvements