Removed Kv unit conversion
Fixed some unit problems and added additional inputs