How come, if he hasn't modulated to d sharp minor yet in bar 16, he already introduces f sharp and b natural in bar 16 and g sharp in bar 18, which are not in the previous key, g sharp major, but in the key d sharp minor? Are you saying that these are all chromatic notes?