add SoW and various updates
merged