some subtle changes

these were supposed to be a part of the previous commit