cleaned up Makefile and launch.sh