Fix algorithm selection

(Was one out due to screwed-up index.) And update the Makefile too.