typo
add more missing changes back in