Added a few things to build for distributing
Fixed things after "refactored" away a class that was off by another only by case ... yikes!