Updated things to my own preferred settings