Some changes and JavaDocs