Lots of various tweaks.