Feature/calcuttj type checker updates

[hschellman]

We should look at this when you are back online. I think I did not make many changes but I'm having trouble figuring out how to/what to merge.

I agree with your command line fixes.