initial commit and fix some fuzzies