Makefile and small edits