Various unfudges and skip->todo changes