Fixed problems with the parsing of literal texts and some with numbers ...