Updates to dwarf class for some more calculations