Auto-restart \o/

And other small things / improvements