Fixed missing states, added trapping to settings.
Updated settings files.