fix makefile; fix options