Fixed Javadoc comments, did not add self for author due to mult authors