Fix Makefile; clean up query_param; modify example