Small changes
Fix
Refactoring. Fixed merging bugs.