A few very minor changes
Changed state queues from multimap to vector