Edits for #456 - starter kit.