yay, updated for the new activator
update control
clean up nslogs
add switch back functionality