some cave fixes