minor updates and accumulated bugfixes