modified main, header / new changelog
modified main, header, Makefile