Fix, improvement, and more control