Major performance improvements
Performance improvements, bugfixes