Making some mods to the options.
Reworked a bit to be more efficient about not regenerating data and
making it easier for external user to specify how to access data.