combined fix for acre issues and gear problem.

combined fix for acre issues and gear problem.