some performance improvements

--HG--
branch : trunk
5 files changed