keep more assoc-space axes at intermediate steps
fix some paths in the Makefile