fixes to alignment