Some more unfudges and skip->todo changes