styling, fixes, docs
merge