collisions fixed, need to edit bounce equations