Figure todo's and placing of figures