Tweaked preferences to make it more legit
Merge issues that I didnt think I'd have to mess with...