fix mobile bugs, a little better..