changed ordering in select function
changed ordering in selection function, started to fix modmap but still buggy