more cleanup, some docs