Various changes and tweaks.