minor changes / improvements