fixing some terrible stuff