More realistic update script, including tidy up.