misc todo items
fix for Runner change
remove cast
merge mess