minor changes all around