Some small changes to parser and retriever
Trying to resolve merge conflicts