added abbrevs and other things