Some Tweaks
I don't evem know man
merged :P