Improved Torque And Drag Modeling Using Traditional And Machine Learning Methods