fixed some stuff...