small changes all around