Multitude of Fixes

Doing many fixes - Will continue to add to this, so don't merge quite yet.