all citations redone

 not at correct position, nor all in though!