Did some more work on pretty much everything.