various updates/fixes