Some tweakings.
Resolved merge conflicts