Minor changes to some of the files. And testing.
Merge branch 'typescript' of https://github.com/labouseur/TSOS-2014 into typescript