a bit more testing & javadoc