fix selection
cleanup