Fixed javadoc and continue implement methods