Fix canvas click crash
Cleanup grave placement code, fix couple bugs, add exciting new ones and some debug info