Some small changes
Working on Makefile for figure*