Makefile improvements and new binary