next round of cosmetics
temp should be false
Merge pull request #283 from ajgilbert/new-cosmetics

New cosmetics