Added tokens (.,), fixed errors