More updates in response to Sam's comments