adding back in many warnings, and then fixing the warnings