A few more fine-tuning thangs

Boom goes the dynamite.