Fix contrains; update makefile labels for clarity