Switched to xml settings and tweaked some thingys