some minor bugfixes and updates