various updates
Fixed conflicts and merged