dox and cleanup
update
more dox