more tweaks to spacing and piece cleanup