fixed selection, move sitll broken