Various fixes, mostly to citations