Typescript changes
Clean up TypeScript
Improved build