Loading speed upgrade and minor bug fix