Minor modifs and improved pandoc_cite

merge merge