Makefile improvements
Parsing