Fix for \defineabrv and some additons for chp 4/5.