consumer_client: add optional parameter to iterate
kayos: major cleanup and renaming.