Improve Makefile
Establish exact correspondence between syntax and types