Fix: Avoid blackhole by setting nodes.body

Closes #336
Reported-By: slighlychilled
Fix: Remove extra key for user data

Closes: 322
Related: b0e5ed6016c94d7e3e62381480fe61f1441b68b8