cleaned up a tad
got rid of the thread stuff for now