tried to fix some stuff