Tweaked makefile, more spec words