fixes based on zeng's comments