updated strings, fixed range checking bug