fixing some stuff on it...