lots of small cleanups (fixes 101companies/101wiki#204)