Work on collision (fixing bugs, wall implementation)