Updated macros, added reboot notifier