final changes and tweaks.