Fix small typo bugs
Painful profile wrangling failures
Cleaning up