Fixed it now hopefully. Sorry I didn't really tests the changes too much. Was worried I would botch it up hard and I did :D
