Memory optimization and minor bug fix