Fixed many a thing