Added Javadocs, removed some Sys.out.println's