main and mobile fixes