removed RCS ident tags, some tidying