did most of the fixes needed