Misc tweaks: Try to squeeze more performace out of the aging NC
-seems to be a little more responsive