Tweaked a lot of stuff for running on other computers