Improvements to accuracy and button to cancel