few more bits of cleanup
docs updated