My changes

Fixed a ton of bugs, and got it working on two different machines.