Fixed: infinite loop
Fixes: various. Added: @is_running