Add some improvements to init script.