Readability changes. Added proper convergence detection (finally). Imported implicit conversions.
Fixing merge conflicts.