Update Makefile
Improve specs