Lots of updates all over, mostly fixes and tweaks