working on mobile, various fixes