Incremented version, moved config options, return vals fixed in 2f checks