bugfixes and minor changes