Lots of stuff.  Mostly, made states strings instead of objects everywhere