Bugfix and improvements to job completion

When I moved the complete run routine over to servermanager, I typoed
the receiving q counter.

I also added a complete marker timeout. 60 seconds for now.
Added timeout to restart
Made the status less naive

Only read from database when necessary