added some more javadoc, refactored options again
new version, small ie fix