reorganised demo Makefile
brought manual logging in line with generated
prepared generated reputation scenario
various function fixes (catch-all, sender/me,...)