Minor changes
Update Makefile