Tried fixing some stuff