The errors Dave found fixed!