Made add/subtract public, added javadocs