Better logging
No more perma-barrel
Make discarding all on death work