Compression style cleanup and minor bug fixes.