Settings added, AR refactoring, some fixes