some fixes maybe
Merge