clean up and added state names and config script