Star Hive: The Menace: Performance optimization and another issues.

Performance optimization and another issues.