Added waiting for packing, cleaned up a bunch of stuff.