Add one more useful body option
Deal with empty bodies better. Closes #91