Minor fix many more comming