cleanup some warnings, start fixing fitting manager