Added a number of other features for citationstyle.py, and a few fixes