merge recent bugfixes