cleanups and docs