makefile fix + misc