cleanup, some more docs