Further mobile tweaks, uniformity almost complete