Bug fix, performance improvements.