added some more methods, javadocs