Added checks for features before setting vars.
Updated options and mappings.