some fixes

Merge and delete