JavaDoc fixes
Changing license from GPL to Apache