a few changes, additions, deletions and fixes.