More updates to Makefile and small bug fix.