Add sweep2wake + fix bttether