Merges all changes from master into refactor branch and fixes some things