added all the states. Some other minor changes.