Added Seat enum, minor cleanup.