fixed some stuff like name