Changed and Tweaked a Few Things