various updates to remove inconsistencies