* Bugfixes (app crashes, optimize app context)