Add & Fix javadoc of Option.