Update main files, prepare for merging