various updates - testing merge