fixed up a few more classes, TS is still compiling