Clean up and fixes (content.zip exceptions, etc.)

Improved NSF handling code a bit.

Improved how missing content.zip file is handled.