Various refinements, mostly to phone version