Improved Makefile (again) and a skeleton for mirari run.