fixed javadoc comments and some spacing issues