cleanup and selection bugfixes