Tweaked a few thigns