Fixing and tweaks.