merge in compactness tweaks
fix some whitespace