look at this terrible commit messages (cleaning things up a bit)