polish variable definitions (only indentation changes)
fix rare condition in which flasher could hang and wont let the user leave