collision detections works better, some glitches left..