major cleanup and version bump, adding sfp