Fixes
Resolve merge conflicts.
Final commit I think