Added a few abbreviations, moved single word abbrev check to beginning