more cleanup/docs