margins and other fixes