fixed some stuff for leo