Some fine tuning on various stuff.