Incremental + bugfixes
Merge branch 'czar-stuff' of https://github.com/humanity/humanity into czar-stuff