More figures and fixing up stuff