Minor changes and JavaDoc