Fixes #1 and Fixes #2 + some additional small Javadoc patches