re-apply some minor updates