Fixed a few things.
Added javadoc
Test of the simpler methods