Fixes to documentation and safety wrapper around the GetOptions() call