Beat's and Marc's merged comments

please accept my changes!