fix unpack for now, needs rework
added cleanup script