Changed several comments