fixed some stuff;