First pass at support for exterior parts
Fix typo and minor tweak to fix some bad corner cases