many more spacing/standards tweaks