collision detection still buggy

redoing it with other people's code