misc changes.

Update Make file, and adjust mod.yamls