FIXY FIXY DWARF

Patching up a couple major bugs