Enhanced Empirical Data for the Fundamental Diagram and the Flow Through Bottlenecks · Study