clean ups and fixes for mobile