added more docs. merged tests