Update, improve, and fix