Sync tmfcore

With this sync, the command line API should work again.