general fixes and mobile new options