Fix conflicts & organize things / Added Dirty Tweaks
String changes