More Habitat fixes

still have a couple null ref exceptions