Add variety of fixes and support LeadingMarginSpace2