Improved Makefile (and reset just in case you fall off the map).