Further revisions on definitions and language issues