Changed some return values on methods as well as made some small
changes to the javadoc

Also clarified some methods with comments inside them