Some performance improvements
1.2.1