updated some notifications and changed to 24hr checking