fix setup script
fix more states
tweak states more