Adding Andrew's publication and other fixes