This closes feedback items received from last round of pre-launch testing