All merged.
Mobile stuff. Bug fixes.