cleaned up and switched to tmk as submodule
new commits