tweaks to Makefile, reran ragel with -G2 fast goto option