Merges in unstashed changes
Fixes erasing segfault
Fixes special resolving heat changes
Merge pull request #12 from IDKJava/erasing_fix

Moves specials into functions && Fixes segfault on erasing