/edits in a couple of new details that just came to me