some small changes by lhw