Optimizations and file saves