some subtle changes all around the place