Lots O' Small Fixes