Requested tweaks
Updated questions