improved ohmCalc from master