fix some stuff5