Fixed many minor mistakes