Bug fixes, cleanups, history be damned

Just a sync up with what we're running in production