improve, fixes