RMSE.short function, other minor modifications