various updates through-out