Submitted by: tim@cs.city.ac.uk
minor cleanup. Added $Id$ to files that did not have any version info, etc