More updates to example code and Makefile