update bib
update macro spacing issues again