some moar derp fix-ups and tweaks