Some changes per Ross.
Updates per Ben's comments.