added total dye, fixed surface moments