For issue #85

Also cleaned up some litter files that my computer added