Wrote more stuff, added a few figures