2007-07-18 insilmaril Minor updates