other random changes that should have been in the previous commit