misc cleanups, documentation