Adding figure titles and some more cleanup
Adding image/table references