lesser changes / fixes