a few bugfixes and merge conflict resolutions