- Minor improvements and optimizations