fixes and adjustments.
Backwards compatible.