Added air resistance and correct dealing with gravity