Fixed somthings
Merge conflicts