Update + Revert

Update to latest tpt source and revert my trial to merge @mniip console and unicode