fixes and various updates