mapper and tutorial edits