Simplify wall geometry height calculation, correct attributes