Pull Request: #126 States could have a more meaningful name. Group L2C2

Fixed problems pointed out by Alex.

![Screen Shot 2013-03-26 at 4 15 55 PM](https://f.cloud.github.com/assets/3182048/331420/3f04c738-9bec-11e2-9d80-c57e3ab21296.png)