Fixed state combo, added data to dev:setup