improved extra behaviour for consumers
update tests and bugfix