Tweaked a few bits and pieces