Tweaked a few little things