Bug fixes on options.
Still working on defuaults applied when partial data provided does not
provide a value for that option.