Cleanup a few things, still need to fix q2 code