general fixes
Merge conflicts fixed