More updates to initial setup process