fixing restart and others