Update, fixed bugs