No threads because I'm sending, also fixes from Friday hack day