2009-05-26 insilmaril Various fixes and simplifications