Big Fixes, prep for Slicer's Extension Index
Big Fixes, prep for Slicer's Extension Index