More fixes thanks to Kulcsar Dalma.
More vocabulary.