Various cleanups and added custom cycler.

--HG--
branch : trunk
16 files changed