Cleanups... add external histogram generator..