Update, comments mostly