Fixing decompression, assorted changes: first attempt