Add more states, do some fixes