Optimize makefile and check in draft spec file improvements.