Improve init script (take 2)

Some smaller improvements on the initscript.