Final adjustments of Makefiles etc. for first test runs