Draft updates in response to feedback from David Evans. Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>