added vibration to settings, readded timeOutAlert that was lost in last merge