selector and fixes