s/consummer/consumer/ + improvments