added/modified some commentaries