optimization for mobile & bugfixes