Ok, just fixing a couple of things... again :(