remove TODO and modifies Makefie in lib