more docs & clean up