2 improvements I would like to see

Thanks for your suggestions