Removed debugging code, changed output format and a minor doc change