Minor changes; Start on bootup