seriously fixed all teh things