Added strings and equality
Improved parsing. added tuples.