few fix and changes