fixed some stuff I broke