changed some collection types
fixed up seat logic