Various changes
Committed more debug code for shadow controllers