More variable name clean up, about to begin fixing working directory/threading issue