Initial revision of basic diff tool