improve some copy, flow