Mike post beta review

@tcatapano This pull includes the fixes to abbr and expan that I mentioned to Kertsin in #278