Compile TypeScript, #7 and #2 changes