The only things I woud recommend changing are throwing in an extra deck of cards, get the next largest size of fire extinguishers, and half again more water.. double, if you can afford the space penalty.