Lots of commented-out debug lines left in - are they useful ?