lots of citation-related updates