I have just fixed some things, take a look. Sorry if I didn't fix the bugs you had.
Don't worry, I was telling you just in case, but anyway, now it's better than before.
