moved and fixed switch log message
uncommment non default controllers