Revisions 4/21

Made some of the final updates.