various fixes

fixed shift selection