renaming some vars to make them closer to what they do, also experimenting with + for docs