Update changelog, some refactoring, fixed another permission