fixed some stuff here & there