Misc updates

Minor changes. Merging, closing, and removing the branch.