fixing some stuff that worked before