add some changes that didn't make it up in the last commit