Update to Makefile, fixed gather target.