Some Tweaking with a few things