various updates and bugfixes