More javadoc written, some new methods