a few more exs and Makefile changes