Made changes for #312 more robust, added restart cluster feature