fixes

Merge and delete.