Also some spelling issues