Efficiency enhancements & diff file by file; intro text; TODO updated