Putting together some revisions after some time on the back burner