Simple collisions and boundary check fix
Simple collisions and boundary check fix