More typo fixes, bug fixes and prepwork for supporting slice-membership