Optimized models.
Fixed file list bugs.
Fixed bugs which arose after the optimization.