Fixes and minor adjustments.