New function additions and fixes to the way options are set.