bug-fixing and additional fix logging, add develop of makefiles adn diffing