update/fix javadoc, add some @Overrides

Fix #86