various updates
More fixes