Merging to live lots of changes and fixes