Added a few features

* More robust init script
* Added a few options