More changes, unfortunately not a change to my inability to write more specific commit messages