Update, cleanup and live test link