added spitfire to bench and did some more refactoring

--HG--
branch : trunk
6 files changed