even more fixes!
EVEN MORE MOBILE FIXES ARGH