some updates to the mobile
some merges