Well tested version. All tests pass. Many bug fixes and adjustments.
merge