Grenade tweaks

Closes #343.