Readjust roulette; tweak Makefile