Fixed collision system, Changed some things