small improvements
resolved merge conflicts