$abbrv safer. Closes #3