Improved GUI and updated Makefile