Updates. I didn't try making the figures line up nicely yet.