Comments addressed + javadoc improved + other minor fixes