Add payment plan fee, fix other totalling