Slimming down, changes, mobile fixes (hopefully?)