A few more comments/changes