adding comments
cleanup
documentation
merge