Added Javadoc
Added some getters and setters
More Javadoc added
Added bullet points and javadoc