fixed more of the additional changes