Added more objects and bad file save/load