fixed up wording of states (closes #168)

Also removed duplicate state definitions.