libbinmat.c is still full of old devel/debug code (mostly commented). Go through and clean/tidy it up.