fixed some terrible