Automatic on/off option, some other updates.