Lots of small tweaks and updates