More E33 comments and clean-up