Build 2.0.2.34, optimization and bug fixes