1. Added the ability to delete a node with 2 children.
2. General clean-up.