Comments and JavaDoc corrected