Updated to latest version and fix init script