Makefile cleanup, start implementation of nval commands (not working yet)