Better asserts and Makefile