air factor bug fix & some other fixes