More tweaks, here and there.