clean up a few things, start working on making theta do its thing..