New exercises and new Makefile