Patched alot of stuff

Woohoo, school is done, finally got some time for this, anyways I
changed the settings system to XML