few tweaks for final release.