Added some more exports.
More adjustments.