various updates & fixes