fix settings, storage, new cn_server