Fixed merging issues, some last edits