changes to reflect mundy's pull request of neatening graph mapper.