Update mistaken return from .catch().
Update the build and add a Makefile to simplify calling commands.