prepare for central deployment
Handle strings in parsing

o Initial tests
o Some simplifications