Addition on Devour and other small fixes