Misc WIP
Misc tweaks