Bullet time fixes, still not done