More .tfrc cleanup, added smart wimpy stuff