fixed some stuff... I guess