Lots of routine tweaks

-