Fixed error-producing Makefile; Also does a better cleanup job.