Small improvements

o retabs several files