I think this is ready to be committed now.It's been a long and tiresome road ;-)
Last-minute comments welcome.
cheers
andrew