some fixing-uping