minor API changes, some javadoc added