fix a derp and tests, fmt