Adding JavaDoc, Fixing build