Final polish and JavaDoc