a few changes, deletions and fixes.