Minor Changes to Makefile and engine