Control Setting Improvements.
Unfinished work towards continuous mode