Mode selector and bugs