Fix exercise instructions + simpler makefile