Merging repos
General fixes
Merging files