Fixed some bugs, finalized everything, updated jdocs