more changes to update, replace, fixes