Misc changes to make stuff better in the real site

Auditors: eater, cbhl