Add wall collisions
Fix fatal collision error