Tried to fix some stuff