Fixed reboot/restart for recover function, refactored streaming add, created reboot/restart handler