incorporate dave's edits to guide-short