Remove fixme tag.
Add missing Javadoc.
Clean up options.