Feedback incorporated from Antoine, Phil and Makx

Based on raised issues 14, 19, 20, 24, 25, 26, 28, 33, 34, 35, 37