Fix producer logic/improve consumer, logging