Corrected & added some Javadoc comments