revert && update Makefile
fix up mobord