more clean up; updated docs