Adds phone-b phone-a tablet-b tablet-a and cleans up options a bit

prune comments