Fixed a few errors in states