Some minor tweaks, WIP post 9