Updated Simulator makefile