Fixes switch toggle reliability and resolves several issues that coul… #294

Job	Run time
Validate with hassfest	18s
	18s

Provide feedback