Removed the compression due to potential information leakage + minor fixes