More control adjustments based on feedback and minor bug fixes.