More changes, still trying to figure out how to publish

unable to actually publish, but at least the source is current