Lots of tweaks and new stuff.