whitespace, follow coding style document regarding file headers, some string changes from Bevan's patch.