Update, several fixes