minor changes to citations not there yet
fixed merge conflicts