Fixed horrible things I did