Bunch o edits by Scott and me