Various clean up and test additions/fixes
Add docs
wip