Mostly cleaned up lumos.

Also added restart capability.