made some fixes on my game, still buggy :/