move figures into main text and switch bibliography format