Major update.
Resolved merge conflicts.