Fixed bugs
Improved collision system