more changes

wow, my commit messages really went downhill, didn't they?