fix verbose output; remove commented-out includes.
4 files changed