Incorporate changes requested by Bun and Rodrigo with major changes to some content Signed-off-by: Tom Leavitt <30448839+tpleavitt@users.noreply.github.com>