Implementing @Internal correctly (Note, not a user name Github), assorted changes.