improved documentation
merge and documentation tweaks