fixed bugs on collision system, but still has bugs