some tpt++ changes
Merge remote-tracking branch 'origin/jacob1's_mod' into jacob1's_mod