Fixed many incorrect formulations and typos