Mobile performance improvements -- code clean up -- maybe feature additions