cleanup, and to fix error handling in makefile in express handler