Minor changes & some javadoc comments added