other bug fixes

now it works but the selection seems to fail -.-