Bug fixes

Made sure package unzips and cleans up after itself.