Some updates in collision detection
Entity moving working