Remove debugging
Support spaces in archives
Be smarter about where the requried files are