More compression and fixes