Added DF/DP, and a few other changes