Revert "Revert "optimization for mobile & bugfixes""

This reverts commit 7b9f36ee58c7b9e4107554391fe4436e3f236d4c.