Further cosmetic changes
Small administrative fixes
Removed old CVS id tag