Tweaked a few bits