More Comments

Add more javadoc