Fixes #1 and #2 + some Javadoc patches