fixing conflicts iwth old syntax, fixing regexp

fixed logic of abbreviations expansion