Performance improvements and bug fixes..
Performance improvements and bug fixes