More cleanup. Added figures.