minor changes/bugfixes