Added a few features

* More robust init script
* Added a few options

Change-Id: I63d6df8405c8dcd118482a974f1304813e33ae0f