Tweaked a few things in reg.