Other improvements and optimizations

System