Makefile fixed
cli fixed