Cleanup Makefile and get 3 more targets building.