Fixed filenaming for new save function. Fixed packing.