It is not always clear how to write down short notes, as in measures 16 - 19. Then I ask my computer how it sounds and I choosed the first solution:

Not every music software plays the grace notes the same way.