Corrections
Maaaany changes
Fixing merge conflicts