minor changes / bug fixes