Lots of small nice changes