Patch 1

Hello!

I've corrected last errors and I suppose it's ready.
I hope, I've helped :)