Some comments and internal changes.