fixed crucial details