finish w. out mobile
some mobile fixes