Some typo + code fixes in 19, thanks Roel!