Fixed all bugs \o/

Took me only 6 hours ^______^