Bunch of style changes and stuff