fix restart, config simplification