Fixed threading properly
Ran auto-fixing stuff