E33 comments and some descriptive renames