Fixes and enhancements#2

pattertj wants to merge 1 commit intomainpattertj/ts-api:mainfrom

Fixes-and-enhancementspattertj/ts-api:Fixes-and-enhancementsCopy head branch name to clipboard