cleaning up & intlist for random events

also added test buttons to states, transitions between states still not
working properly