Fixed broken build + minor changes in javaDocs