resolved merge issues, several minor changes