Makefile adapted. slight changes in sourcecode