consumption, more fixes