1.0.6: First pass editing done.