various updates
resolved merge errors