Add config options for upgrade max levels, more code cleanup, slight tweak
to sharpening kit behavior