Fixed comments, new JavaDoc