Update, some fixes