Added all the states. Fixed a few warning flags.