more tweaks for alignment and such