added some threads to the main loop and some deletes
nvm this merge