Fixed more bugs, and reenabled restart level it works now
Merge remote-tracking branch 'origin/master'