various additions, deletions