Improved tool and makefile.