clean up, modify docs