cleanup
documentation added + merge conflict sorted..