fixing refrences to a few functions that have been moved around