Final version + Javadoc
A few files that didn't make it w/ the previous update