some small clean-up tp uprg.c and Makefile