minor changes / fixes