Minor Fixes + Initial JavaDoc \

Some minor fix. Added the JavaDoc skeleton.