Fixed citations and lots of small stuff
Fixed conflict