some fixes on friendy (still messy)