nlp: doing the changes discussed in a meeting with andrew; still needs better names