Fixes, cleanups, docs