Fixed tons of ugly shit