fixing some stuff that was wrong