fix and add new options for makefile