Misc tweaks & additions