Improved Prediction Models for Crash Types and Crash Severities